Merge changes I5e79a906,I10e49e98 into main

* changes:
  Fix channelCount_ nullptr check typo
  Adding both large_frame flags while signalling