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