Merge "Avoid race condition during grayscale animation of QS tile"