Merge changes I28adf676,I9b1a5583 into sc-dev

* changes:
  Ensure that HUN ordering is correct for Incoming CallStyle notifications
  Improve notification style comparisons