Merge "[DO NOT MERGE] Update contextual cards display mechanism" into rvc-d1-dev