fix nav buttons for fxOS2.2 (bug 1095709)
reset the offset after switching between mkt/settings navbars
Merge pull request #825 from ngokevin/navbartweak23

fix nav buttons for fxOS2.2, reset offset switching between navbars