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

Change-Id: Ifa487b7d65ad5a3c21654c6910fb785d47a1a0f1