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