Merge "Don't wait for visible if there is no running activity left." into nyc-dev