Merge changes I09b3999a,I590be0ba into sc-qpr1-dev

* changes:
  Use tertiary accent color for expander with unread count.
  Fix ContrastColorUtil.findContrastColorAgainstDark to return the valid color