Merge "Fix TrustedCredentialsSettings for small screens"