Merge "Fix taskbar hotseat alignment"