Merge "Rebuild actor map if it's queried before onSystemReady"