Merge "Fixing crash when task is already parent of activity."