Improve SASS minification

Backport #2394