Merge "Hold WM lock when add starting window to TaskOrganizer" into sc-dev