Merge "Keystore 2.0 legacy Keystore: Cleanup when app/user removed." into sc-dev