am 8a18afc4: Fix issue where crosshairs wouldn\'t disappear (issue 5190654)

* commit '8a18afc4aa7217e293e0e96a23ac1cedaabc3738':
  Fix issue where crosshairs wouldn't disappear (issue 5190654)