Merge "Move ServiceListing to SettingsLib"