Merge "Deliver new activity options after the activity is made visible" into nyc-dev