Merge "Fix issues with landscape transition" into rvc-dev