Merge "Camera2: Add timestampCalibration tag"