Merge "Allow two SurfaceViews inbetween the app and the wallpaper."