Merge "Add a new field elapsed_time_millis into Settings' atom"