Merge "Avoid race condition during grayscale animation of QS tile"
am: bceee1cbb4

Change-Id: I9a2cddd23d79c1cdd1cee75769f8589be1c9492d