Merge "Camera: check return value of callback" into pi-dev am: 6efdef720f
am: eea1100c0d

Change-Id: I820062fbaeda3da68d0749a240b90daf4ef67b4e