Merge "Hide SAW subwindows" into udc-dev