Merge "Tweak snap settings"