Merge "Implement Settings#checkAndNoteChangeNetworkStateOperation on CS" into sc-dev