Merge "Clear secure user ID and notify keystore when lock is cleared"