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

Change-Id: I6e6d53f05c1645f9b4a551362ddc9a2c51af5268