Merge "Disable preview on volume change"