Merge "Set resolvedType when starting activity in TaskFragment" into main