Merge "CSD: Avoid higher volume when resetting to RS1" into main