Merge "Fix frozen screen after exiting vr"