Merge "Revert "Update Trusted Credentials screen in settings"" into lmp-dev