Merge "IWallpaperServiceWrapper keep track of multiple engines" into udc-dev