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