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

* commit '065f321de92cfe8e86eaaeb86f0a0420c9300fbf':
  Fix calculation of default wallpaper size