Merge "C2BqBuffer: Remove detach during migration" into tm-dev