Merge "Don't Beam from Phone/Contacts list." into jb-mr1-dev