Merge "Fix SocialWidgetConfigureActivity contact-picker double-launch." into jb-dev