Merge "Fix keyguard timeout dialog messages" into jb-mr1-dev