am d6d565fc: 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 'd6d565fc1df629ff392571b5cedd697eca6763b2':