Merge "Fix Pip tests after Pip Menu migration to a Window"