Merge "C2BqPool: Expire waiters on Surface switching" into main