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