Merge changes Ie01dfc5c,Ie89c4ae1 into fp2-dev-v2

* changes:
  FP2-1335: Inconsistent layout clock widget
  FP2-1317: LockScreen Clock does not update when language changes