Merge "Fixed temporary brightness getting stuck bug." into pi-dev