am 23f6049c: Merge "Disable "Create new contact" when setting photo from gallery." into jb-dev

* commit '23f6049c362294386399e4cc10ca8d66c93050be':
  Disable "Create new contact" when setting photo from gallery.