am 58dc615b: Merge "Make popup non-modal for contact aggregation suggestion." into jb-dev

* commit '58dc615bcba98e1546b3c0638f4c1b41622ea62f':
  Make popup non-modal for contact aggregation suggestion.