Merge "In MountEmulatedStorage() don't create a mount namespace unless actually mounting."