Merge "Update Hotseat icons adjustment X calculation based on cell X Index" into main