Merge "Prevent reparenting to a fallback target while relaunching a pinned task" into tm-qpr-dev