Merge "Update default keyguard clock to new UX specification" into klp-dev