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

Change-Id: I7d7d9b811a08c68403e7a7539793cc4af226571e