Merge "Create Device configuration for per feature binding in ImsResolver"