Merge "C2BqBuffer: fix to check consumer usage when migrating during surface change" into main