Feature request: timeout for map unlock

I find that whenever I use the map unlock function to look around on the map, most of the time I forget to turn it off again, leaving the map stuck in the position I left it. This is especially a pain in the full-finger glove season (including today) because successfully tapping the lock icon tends to require taking a glove off and putting it back on.

I would think that a timeout of something like 20–30 seconds should be plenty before the map can go back to following current position even without specific input to that effect. Creating a route by dropping a pin after the unlock could just lock the map again immediately for all I care.