Merge "Avoid race condition during grayscale animation of QS tile" am: bceee1cb am: 36f27fa6 am: 24220265 am: cded1f30 Change-Id: Iabbaa5dfdf84b2593a2caf7258de2e1a19d496d0