Merge "Fix frozen screen after exiting vr" into pi-dev