Merge "Fix vr_hwc crash when re-entering vr" into pi-dev