Revert Settings: add navigation bar category

Change-Id: I83f44cd26af1acef39a947cd27657263deeea47e