Merge "Fix blocking task switch when 3P launcher is used." into tm-qpr-dev