Merge "Reset keystore when user is added or removed" into lmp-dev