Merge "Revert "APM: apply volumes when abs volume stream changes"" into main