[2/2] Settings: Navigation bar height/width

Change-Id: I89bc56d94d2e6db3b9047c13ca23bad9c58dd85e
Fix removement of NavBar category on non-NavBar devices

Change-Id: Ic066fa4f9d97bca1a6442fd13723ad711bc59de7