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

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

Change-Id: I31068eef755e82f3e9e1e5cb00855012f727789a