[FXOS-149] make sure smart folder edit mode is toggled off correctly
Merge branch 'folders' of https://github.com/EverythingMe/gaia into folders