Merge "Ensure taskbar hotseat array index is in bounds" into sc-dev