Merge "Don't remove task needed for reuse when clearing during activity start."