Merge "Revert "Add device dimension data to wallpaper backup flow"" into main