Merge "Camera: check return value of callback" into pi-dev