Merge "LockScreen: don't update KeyStore password on unlock" into jb-mr1-dev