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

* commit '04cead14b627947df7f1b713c35a3e03bef94286':
  Fix calculation of default wallpaper size