Wrong layout file chosen for 6" phones.

Bug 26353161

A 7" tablet has a short side of 600dp, not long side and
the smaller 6" phones should not use the tablet layout.

Fixes the padding so that the overscroll highlight
isn't floating in the middle of the screen.

Change-Id: I1100ed907ba8184707da637204141a2b37414f91