Merge "Revert "Partial revert of "Fix Surface slot caching""" into nyc-dev