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

Change-Id: I5f49f6741c89b03ad67ca963d47488eb6834dcd1