Merge "Deliver new activity options after the activity is made visible" into nyc-dev
am: e9f5d365bb

* commit 'e9f5d365bb740edade62290d1d835902a58cfdf2':
  Deliver new activity options after the activity is made visible

Change-Id: If1a902d4fb7ebfa5d2b08ab495195f7e90e20340