Merge "Fix frozen screen after exiting vr" into pi-dev
am: 012d6b420b

Change-Id: I4cedfdaed24afb6adc29b564d7b02b82902185ca