Merge "Ignore brightness change thresholds for manual changes." into qt-dev
am: 8a03eb7842

Change-Id: I55e6a0fc2d9b91cca33cb92aefe8f37703687c24