Merge "Keyguard: Increase clock size" into oc-dev