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: I8dc17b803f56a47e29518026e6b6e223a0964ff8