Merge "fix mistaken check of mScreenBrightnessDarkConfig"