Merge "Clean up naming of getWallpaperInfo functions." into tm-qpr-dev