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

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

Change-Id: I76d6c9cabd16e2c99eb97f4f37d188838f248614