am 2621f412: am a1fa4d5d: Merge "Fix pop-up menus for photos in contact editor" into jb-dev

* commit '2621f4128f018c04b8f8e000e27d1cb6d635ae19':
  Fix pop-up menus for photos in contact editor