Merge "Remove Beta tag from themed icon toggle" into main