Merge pull request #14591 from daleharvey/946807

Bug 946807 - Dont postResult to activity with no return value r=benfrancis
(cherry picked from commit a14c8ba9fa829cdfa746bda2b88df642daee025a)