am f95761eb: am f8177d38: Merge "Saving the system wallpaper thumbnail prefixed by the SDK_INT so that it is recreated after a system update." into ub-now-porkchop

* commit 'f95761eb247bd0bd55d8c24169a35783aa67558f':