am 85d72022: Merge "Fixed group editing popup from contact editor" into jb-dev

* commit '85d720220cb69226f7d809df849eb1e9604b2c0f':
  Fixed group editing popup from contact editor