[FXOS-124] more animations and timing changes
Merge branch 'enhanced' of https://github.com/EverythingMe/gaia into enhanced