Merge "Fix potential StrictMode crash with miniresolver" into tm-dev