Merge "ExternalCameraHAL: Get old image if taking picture without preview" into main