Merge changes I5a807bbb,Icc3dd959 into sc-dev

* changes:
  Add an intdef
  Fix contrast issues in channel blocking ui