Merge "Add a compat hack into SurfaceView#setWindowType()"