Merge "Re-enable mirror for brightness slider" into sc-dev