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