Merge "Created a helper method that calculates the hotseat icons shift X." into main