Squash commits of the following:
PA's hybrid engine b25dccb6e87d01ef2dab5fd0f1cf4ba22e0e32a4
UI change w/o reboot and navbar height 45a0ad9ef77e8f70f1d6ce12b8c6b05399f2b053
Navbar height fix ce7184b4397abba52500094e31c7de4247c683d2
Switch UI mode without reboot ad75ffd43e8bd731ec88cde4f416cdb31088a28d
Get proper values 399315aba1b7f9a842afd908588f717e97aa4f7f
This was left out f2f926828257d684c410888e9496eeaf250338e3
Signed-off-by: Kristofer Ard <kristoferard@gmail.com>