Merge "Move ServiceListing to SettingsLib and add tests"