Merge "Disable "Night Light" mode while in VR mode." into nyc-mr1-dev