Merge "Adapt WallpaperDataParser for lock screen engines"