Merge "Fix setting wrong final volume." into main