Revert "Navigation bar dimensions and Master switch (2/2)"

This reverts commit b41d956d13afbc25a38f4fa6cbe7a493f2d871eb.

Change-Id: I3d8e047f80a16a6a25c1dfcf728a11c8e20adc24