Fix removement of NavBar category on non-NavBar devices

Change-Id: Ic066fa4f9d97bca1a6442fd13723ad711bc59de7