Merge "Remove never used SocialProvider and activity table" into jb-dev