Merge "Fixed temporary brightness getting stuck bug."