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