Merge "Fixed temporary brightness getting stuck bug." into pi-dev
am: 8a5f23791c

Change-Id: I8c80cd6f14dc36eb37b27cbe51598412e59ad34f