am 19a38f6f: Merge "Fix SurfaceControl.setDisplaySurface() such that it...
am 19a38f6f: Merge "Fix SurfaceControl.setDisplaySurface() such that it accepts a null Surface" into jb-mr2-dev
* commit '19a38f6f':
Fix SurfaceControl.setDisplaySurface() such that it accepts a null Surface