Merge "Add test for setting/keeping scaleType on StatusBarIconView" into main