Merge "Fixed a race when slot-to-sub mapping table is rebuilding"