Merge "Camera: Do not forward capture_result in error condition" into pi-dev am: 99a619059a
am: cd024b1aa5

Change-Id: I26db7e1614586e37392f87c8177b641965026390