Merge "Camera: Enable API for dynamic camera output surfaces"