Merge "Fix SurfaceControl.setDisplayBrightness error msg" into sc-dev