Merge "Grant ownership on pip to wm/wmshell group" into main