Merge "Save tasks' windowing modes instead of TDA's" into udc-dev