NavigationBar: Custom height (2/2)

Ported from http://review.cyanogenmod.org/#/c/23610/

Conflicts:
	src/com/android/settings/cyanogenmod/SystemSettings.java

Change-Id: I8baa4366373e6219d1e7354c94e2e0d0582eb2ed
Merge branch 'CustomHeight' into cm-10.1