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

Change-Id: I9f84dd9b83de294dbafc507db6d9c280d8cfb1a7