Revert "Map preference and waypoint dialog moved to drawer menu."

Reverts osmandapp/Osmand#924