Merge "Fix 6119433: disambiguate screen brightness changes from other lights"