Merge "Revert "Disable preview on volume change" "