Merge "Fix pinning dialog for Chooser direct targets" into tm-qpr-dev