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

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