Merge "Fix surfaceInset adjustment." into nyc-dev