Merge "Revert "Revert "Remove a compat hack SurfaceView#setWindowType()""" into pi-dev