Merge "Don't stop paused activities that are visible." into nyc-dev