Merge "Enable time format localization in keyguard" into klp-dev