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

Change-Id: Id31c6014c232155d4045a6630209b7bd6d70666b