Merge "Fix Surface slot caching" into nyc-dev