Bug 815093 - Compose activities returning to caller app r=julien

Bug 815093 - Test fix