Merge "Avoid adding unnecessary topMargin to TaskThumbnails in DesktopTaskView" into main