Merge "Remove connectivity monitor switch from developer options" into pi-dev