Merge "Fix the janky transition of contextual cards." into rvc-dev am: ff35a3e641
am: 391ebade33
am: abd6bc4eeb
Change-Id: I28c4a8b58a83614e72f6bcf3029edf6075bfb69c
This commit is contained in: