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