Merge "Make hotseat fit one line on tablets"