Merge "Keyguard: Remove fancy colon" into oc-dr1-dev