[automerger skipped] Merge "Fixed temporary brightness getting stuck bug." into pi-dev am: 8a5f2379
am: 9a211284 -s ours
am skip reason: change_id Id3a1bff533b1bee9ca760e742dab379eeeb4b14e with SHA1 3d2c5af8 is in history
Change-Id: I810c0898511da4a6b0f7f22879ce29ac938b4794