am 6e9123a6: Merge "Fix flashing in geometry panel" into gb-ub-photos-arches

* commit '6e9123a658d4ed0dcb80dd376c676f043e2f4baa':
  Fix flashing in geometry panel