Merge "Refactor AppConfigService with tests"