Merge "FastPath: Clean up state queue instantiations"