am f080a24e: am 04cead14: Merge "Fix calculation of default wallpaper size" into klp-dev

* commit 'f080a24e09eed73159e1e877dce2b6bf81744d40':
  Fix calculation of default wallpaper size