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