Merge "Move brightness handling to a background thread" into nyc-mr1-dev
am: f1a6f1e032

Change-Id: I5d95fb39f18e58d9eaa330217e498e758df30d03