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

Change-Id: I6c24833ae8e5ab673848f5be11dc925427f842f0