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

* commit 'ee2e072378b6cf71af565f9a022591e169fdbaea':
  Don't wait for visible if there is no running activity left.

Change-Id: Id2870463a3b94e4c3319e0d26cd5ad1a0b24095f