[ANDROIDAPP-596]

The map module now remembers previous search terms.
Merge branch '2.4-dev' into 2.4/feature/dining