Merge "Fix vr_hwc crash when re-entering vr" into pi-dev am: eca63ec2fb
am: d0e665e8cf

Change-Id: Ic111f6ed96ca5b7e30fd76536746ddaf3d46c3dd