Merge "SurfaceControl life-cycle refactoring."