Merge "Suppress the first volume adjustment" into pi-dev