Merge "Remove ProgressBar from AppPreference" into main