This is less confusing IMO. The dialog will shown up only if users decided to in the preferences, so that will not bother users who don't need this. This reuses lot of things from Alan contribution from #4484