Merge "Camera: fix use after freed error" am: b7939bbfbf am: d0cc49f98d
am: 12a4218bd6

Change-Id: If205b11101420feb9318ff26e5d85c3375f63d3d