Merge "Add lock when adjusting suggested stream volume." into pi-dev