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

Change-Id: Ie15f57d6905c6827a4806368c1f1e78b45c8209e