Merge "Camera2: add surface set ID"