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

Change-Id: Ic2d8d779fbf8246e7e75f1c42fd63555681815fb