Merge "metrics_uploader path; display metrics send fails" into main