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

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

Change-Id: Iea963aa552092cea3d06e929b7a2828caba5bf4b