Merge "Make setBrightnessConfigurationForUser locked" into sc-v2-dev