Merge "Move WMComponent to wm shell" into main