Merge "Camera: fix cleanupFailedRequests + HAL buffer manager path"