Merge commit '585519fdd60d74b82d77f1d7d954054bc7f4488e' * commit '585519fdd60d74b82d77f1d7d954054bc7f4488e': Add new date formats for the lock screen.
Merge commit '585519fdd60d74b82d77f1d7d954054bc7f4488e' * commit '585519fdd60d74b82d77f1d7d954054bc7f4488e': Add new date formats for the lock screen.