Merge "Announce changes in keyguard message, e.g. bad unlock pattern." into jb-mr1-dev