Merge "Fix default clock localization in keyguard." into klp-dev