Merge "DO NOT MERGE: Delay brightness change" into pi-dev