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

Change-Id: I70301a77d89271e74e69efb92f340f1dbf6b3ca8