Merge "Revert "Revert "Add test for setting channel mask.""" into sc-v2-dev