More defensively handle initial expand
More defensively handle initial expand

Reviewed By: jknoxville

Differential Revision: D32674423

fbshipit-source-id: 0d8216ebb9da9530c53c7209dcd18eb677c73fc3

facebook/flipper,facebook/flipper,facebook/flipper,facebook/flipper,facebook/flipper,facebook/flipper,facebook/flipper,facebook/flipper,facebook/flipper,facebook/flipper,facebook/flipper