Merge "Fixed flickering when quick tap on brightness bar" into pi-dev
am: 0631de5772

Change-Id: Ifbdc6e0060a4e8371c5cd4592ca7d2a1cf755b42