Merge changes I0fc3b7ae,I712e6d6b into sc-qpr1-dev

* changes:
  Reduce the color contrast requirements for the emphasized action button fill color.
  Refactor the color span code inside Notification.java and add tests.