Merge "softap: Add channel configuration parameter"