Merge "[DO NOT MERGE] Remove taskAffinity="" on shortcut targets" into ub-contactsdialer-f-dev