Fix tablet layout issues.

Change-Id: Ie2be83067343efd77687c48ab185e25b00d65cfd