Merge changes I5e258e23,I72323430 into sc-dev

* changes:
  Update isLinkHandlingAllowed to mean all or nothing
  Update intent resolution logic with new rules