Merge "Show the icon of the active mode in the Modes Tile" into main