Revert "Add back a helper pref that holds a system setting."

This reverts commit ea3da10b29d21517892fc874a56cf2fbf36c6df4.
Revert "Navigation bar custom height"

This reverts commit 86996ed94dcfce4d815fc018a60e71a751011228.
Advanced options in build tweaks