Merge "[ActivityManager] Avoid improper resume top activity."