Merge "Use Material3 BodyMedium for save/creation supporting text" into main