Merge "Fix test failures under settings/wallpaper" into main