Merge "Delete useTargetActivityForQuickAccess." into tm-dev