Merge "Properly defer entrance animations until after the stack is reloaded." into oc-dev