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