am 36f585b0: am f7b248b2: am 87752940: Merge "Fix issues with sizing wallpapers" into jb-ub-now-jetsonic

* commit '36f585b05b9d8d3fe14043a06e19c4f1dad7f6fb':
  Fix issues with sizing wallpapers