Merge "Make Hotseat report shelf height on large screen devices." into tm-dev