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