Merge "Camera2: Unhide deferred surface configuration APIs"