Merge "overlay: Fix pipe type related priority checks"