Merge "Camera2: Update sync.frameNumber tag"