Merge "Align hotseat drop target with the adjusted hotseat" into main