Merge \\"Fix unresponsive brightness slider after font size change\\" into nyc-dev am: db81dd9d2e
am: ac52bbec1f

Change-Id: Iad5d76cbfc8c60083d5675a4262e6be8d93f5e89