Merge \"Fix VR transition for display on/off sequence.\" into nyc-dev
am: 931a7c03e0

Change-Id: I406724ea21cd7cfde2be6aa922ac636c7b7f23a8