Merge "Revert "Revert "Partial revert of "Fix Surface slot caching"""" into nyc-dev
am: 4782b268d5

* commit '4782b268d54d737294de7b51bdff4ecda2f1c1f0':
  Revert "Revert "Partial revert of "Fix Surface slot caching"""