Merge "Add new preference round corner background in SettingsTheme" into main