Merge "Fix blinking for the active tile" into main