Bug 1022985 - SmartCollection is not placed where you tap

https://bugzilla.mozilla.org/show_bug.cgi?id=1022985

Gaia-try: https://tbpl.mozilla.org/?tree=Gaia-Try&rev=a4a4cdabaca1
>I think resetting it on the activity return should be fine. 

This would be relying quite a bunch of both assumptions about ordering of messages from the platform and ordering of the datastore events vs the activity messages.