Merge changes I48717c7c,Idc111ccb into rvc-dev

* changes:
  Highlight provided channels
  Only use "apply" when there are changes