Merge "Ensuring that we unload all resources after a transition."