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

Change-Id: I69dbb891acbfefb7c9547cb5b58e4d19011fdb3a