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

Change-Id: Ib0039015a209112cad8dafbfef546674c20ed9fb