Merge "Avoid NPE in NightDisplayService when VR mode is invoked"