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