Merge "Enable crop to padding for StatusBarIconView" into main