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