Merge "Fix missing clock in keyguard" into jb-mr2-dev