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

Change-Id: Ib4afffdb096401999669887eacf7eeba6078587c