Merge "[ActivityManager] Avoid mistaking visibility by finishing task."