Merge "Fix issue #4499996: LiveWallpaperPreview activity intent filter"