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

Change-Id: Ib507eb86306687928dc775945e033b2bcfb17ad3