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

Change-Id: Idbd4a2ca541a44c4806d9ce921600740a0e8ca14