Merge "Remove some unused hotseat/qsb scaling code" into sc-dev