[PATCH 5.16 0776/1017] Revert "Revert "block, bfq: honor already-setup queue merges""