Revert "Settings: Handle navbar heights correct on dpi changes + more (2/2)"

This reverts commit 0610dbafa2d99283ff06bd6b698946f604f53069.

Change-Id: Ia88e19220bad51bf60cc0b74652df3a4802a7a75
Merge "Revert "Settings: Handle navbar heights correct on dpi changes + more (2/2)"" into android-4.4