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

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