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

Change-Id: I47d538ee1128a00cab1a7a2e375edf5d9c519cf7