Merge "[ActivityManager] Fix activity always visible."