am 03821dc6: am 962e4826: Merge "Allow two SurfaceViews inbetween the app and the wallpaper."

Merge commit '03821dc6ea9f96e2b420ab327b727fdcefd880d3'

* commit '03821dc6ea9f96e2b420ab327b727fdcefd880d3':
  Allow two SurfaceViews inbetween the app and the wallpaper.