Merge "Set skipSubChannel both to true and false when testing scan and step methods."