Merge "Refactoring GlobalSettingsProto to avoid method limit." into pi-dev