Merge "Implement fallback clock in keyguard" into jb-mr1-lockscreen-dev