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

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

Change-Id: I24abb86db14882ec5ac05981d9944011e5154645