Merge "Camera: Add timestamp base in OutputConfiguration"