am d36628a7: am e8ebec86: Fix 4462497: Fixes crash in settings due to using...
am d36628a7: am e8ebec86: Fix 4462497: Fixes crash in settings due to using wrong layout on 7" devices.
* commit 'd36628a7':
Fix 4462497: Fixes crash in settings due to using wrong layout on 7" devices.