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

Change-Id: Ia5c5bb259305a18b36759925a114523ec53865eb