am fc68261b: 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 'fc68261bf74b9059877c1193d8abb245430e3171':