Merge "SnapdragonCamera:Fix unbind error"