Settings: Don't show navbar on swipe up while in expanded mode (2/2)

PS2: move removePref code to botom
     don't show mDontShowNavbar preference on non-navbar devices
PS3: edit string

Change-Id: I40c4b0354a06fcc8b725ae76ed465de5e3e29d03