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

This reverts commit fed97473222d506688972066cfdf8a56238cebfe.

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