Bug 815093 - Compose/share activities now return to caller app r=julien

Bug 815093 - WIP

Bug 815093 - Rebasing