Merge "Fixing potential ANR when fetching for wallpaper info" into tm-dev