Merge pull request #19070 from lissyx/bug1006356

Bug 1006356 - Fix setting currentChannel value r=etienne_s,rik