Merge "Fix the janky transition of contextual cards." into rvc-dev