Merge "[Hotseat] Fix badging for shortcut predictions in hotseat" into sc-dev