Merge "Remove beta tag for theme icon toggle" into main