Merge "Align real hotseat with taskbar hotseat during drag and drop" into sc-dev