Merge "Fix VR mode handling when the screen blanks and unblanks." into nyc-dev
am: fc465bf

* commit 'fc465bf6bf456f5be1790b2ba60ea3da9c671d71':
  Fix VR mode handling when the screen blanks and unblanks.

Change-Id: I6f7f76da532e6e1f07ec12b213b6b880f3d29d6a