Merge "Surface: Add force disconnection method." into nyc-mr1-dev