Merge "Brightness slider animation, expand" into sc-dev