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

Change-Id: Iae474937b019fe32f8146a58b49ce7d2182948f4