Merge "Credential manager UI changes to fix the issue that UI app uses same repo instance for different activities"