am 52cdcb1e: am 8af8b1c1: am b0e2221f: am 03a526b2: Merge "Stop using a separate ImageView for default wallpaper" into jb-ub-now-jetsonic

* commit '52cdcb1e83e11ed3eb8963c4c9c0dfcae07b7d40':
  Stop using a separate ImageView for default wallpaper