Merge "Replace taskbar hotseat with real hotseat when folder is open" into sc-dev