Merge "Add trust indicator to keyguard"