Fix shaky pinch zoom Fix map position changing at the end of a pinch zoom Possible fix for crash when removing cameras/devices Few small fixes trying to get the map markers to stop shifting around Maybe fix map markers shifting around? Revert "Maybe fix map markers shifting around?" This reverts commit 07139186a869d2c5118eb4617cca0a10d984efd7. Probably actually fix markers shifting around Merge branch 'master' into release