Merge "[DO NOT MERGE] Fix the blank space on contextual card loading timeout" into rvc-qpr-dev