Merge "Fix two monkey issues" into camera-SnapdragonCamera.lnx.2.0