Merge "Fix icon during split task which is inside DW from taskbar." into main