Merge "Fix jank on conversation screen" into rvc-dev am: 35a839a689
am: 3d6dca14cc
am: 13c8c7e999
am: 79a0ffdc75
Change-Id: I94a7cd0f87f8b30f863db58b1b1685b05b9a352d
This commit is contained in: