Merge "Merge "Don\'t wait for visible if there is no running activity left." into nyc-dev am: 103fdec am: 8b38593" into nyc-mr1-dev-plus-aosp