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

Change-Id: I9e1e7ed21669000c664c3a59c681bf706c574907