Merge "Remove usages of PooledConsumer in window manager"