Merge "Reduce max wait time for package settings write." into main