Merge "Add keystore onUserAdded/Removed methods"