Merge changes from topic "reverted-mistakenly-tv" into udc-dev

* changes:
  GraphicBufferSource: Use 64bit consumer usage
  C2BqPool: Expire waiters on Surface switching