Merge "Add more restrictions on whether we increase the hotseat size for tall devices." into sc-dev