Make socialshareprivacy and joyride regular dependencies
Merge branch 'develop' into geo