Merge "LockScreen: only set keystore password for owner" into jb-mr1-dev