Merge "Fix manual brightness slider"