Merge "Turn off ambient settings when DISALLOW_AMBIENT_DISPLAY is set."