Fix 4462497: Fixes crash in settings due to using wrong layout on 7" devices.

Change-Id: I674112df2bdcec0bd94c85b1a777c336c037edc5
13 files changed