Merge "Remove number code from StatusBarIconView" into main