Merge "Settings - Wifi notifications: notify when wifi connects [2/2]…