Merge "[ActivityManager] Finish the failed-to-pause activity"