Merge "Adjust SET_DISPLAY_BRIGHTNESS check" into sc-dev