Lockscreen: make lockscreen weather time more friendly

Change-Id: Iad8882ba250c788744f1fc17130bf509fbc571c4

Conflicts:
	core/res/res/values/public.xml