Merge "Check if WallpaperService is enabled" into ics-aah