Merge "Fix the janky transition of contextual cards." into rvc-dev am: ff35a3e641 am: 3d735f0aa1 am: 014dfa68b1 am: baa19ea952 am: 43b03b8fce
Change-Id: I671905cdc79cf966cac30d33c53964054181860a
This commit is contained in: