Merge "Fix nine-patches to always filter" into rvc-qpr-dev