I've not looked at the query in any detail, but that particular patch won't help as it only allows pushdown of predicate into subqueries with window functions where the predicate is part of all of the subquery's PARTITION BY clauses.
The query in question has no window clauses, so qual pushdown is not disabled for that reason.