Merge "Also set the queue types map when rebuilding the ready queue map"