Merge "Remove customized SettingsRippleTheme" into main