Merge "Remove connectivity monitor switch from developer options"