Merge "Deliver new activity options after the activity is made visible" into...
Merge "Deliver new activity options after the activity is made visible" into nyc-dev am: e9f5d365 am: 9396f7e6
am: 5e5daca9
* commit '5e5daca9':
Deliver new activity options after the activity is made visible
Change-Id: Icca5b70a150d1795669da2c09a5b3bf85fad12cb