Merge "Camera: Remove app segment stream's locked buffer tracking"