Now that the splash screen is gone, these scenarios happen in the exact same context as their "Upgrade by cloning" version. Refs: #8859