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

This reverts commit b41d956d13afbc25a38f4fa6cbe7a493f2d871eb.

Change-Id: I8ed88eb03ca3745397f0175a9e4afead391a59db