Merge "6/n: Add support for additional coex cases" into sc-dev