Merge "Fix adding QoS policy  to the cleanup" into mcp/epoxy