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

Change-Id: Ib280983ca722add1f89f7a640a4f19c761239de9