[FXOS-149] exit folder edit more on screen lock
Merge branch 'folders' of https://github.com/EverythingMe/gaia into folders