Merge "Fix unresponsive brightness slider after font size change" into nyc-dev