Merge "Keystore 2.0: Fix correct handling of Uid/Namespace"