Merge "Fix jank on conversation screen" into rvc-dev am: 35a839a689 am: 3d6dca14cc am: c12aa64001 am: 1994193aef am: 9747ffee70
Change-Id: I783ef37edefb8c0f1c0e134e568fc469b4bc6d46
This commit is contained in: