Merge "Fix black screen during Quick switch" into rvc-dev